(vc-do-command): Remove debugging output. Use (forward-line -1) instead

of (previous-line 1).
(vc-print-log): Delete extraneous lines of RCS output if present.

diff --git a/lisp/vc.el b/lisp/vc.el
index 0a15abf358804b8aa26026df0f7bd4ad6421098e..7795850016ca155a04ec9308c320558443ade4ea 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -207,12 +207,9 @@ the master name of FILE; this is appended to an optional list of FLAGS."
          (exec-path (if vc-path (append exec-path vc-path) exec-path)))
       (setq status (apply 'call-process command nil t nil squeezed)))
     (goto-char (point-max))
-    (previous-line 1)
+    (forward-line -1)
     (if (or (not (integerp status)) (< okstatus status))
        (progn
-         (previous-line 1)
-         (print (cons command squeezed))
-         (next-line 1)
          (pop-to-buffer "*vc*")
          (goto-char (point-min))
          (shrink-window-if-larger-than-buffer)
@@ -1072,7 +1069,12 @@ levels in the snapshot."
       (progn
        (vc-backend-print-log buffer-file-name)
        (pop-to-buffer (get-buffer-create "*vc*"))
+       (while (looking-at "=*\n")
+         (delete-char (- (match-end 0) (match-beginning 0)))
+         (forward-line -1))
        (goto-char (point-min))
+       (if (looking-at "[\b\t\n\v\f\r ]+")
+           (delete-char (- (match-end 0) (match-beginning 0))))
        (shrink-window-if-larger-than-buffer)
        )
     (vc-registration-error buffer-file-name)